From: Matt Wilson <msw@amazon.com>
Date: Wed, 4 Apr 2012 10:09:14 +0000 (+0100)
Subject: PV-GRUB: Check for errors when applying patches to GRUB
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=008f246e971213571f8f41a3e0e9ad4b59257880;p=xen.git

PV-GRUB: Check for errors when applying patches to GRUB

We want to ensure that patches apply cleanly without rejects. Bail if
patch returns a non-zero exit code.

Signed-off-by: Matt Wilson <msw@amazon.com>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/stubdom/Makefile b/stubdom/Makefile
index b63041e729..2da70e3127 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -331,7 +331,7 @@ grub-upstream: grub-$(GRUB_VERSION).tar.gz
 	tar xzf $<
 	mv grub-$(GRUB_VERSION) $@
 	for i in grub.patches/* ; do \
-		patch -d $@ -p1 < $$i ; \
+		patch -d $@ -p1 < $$i || exit 1; \
 	done
 
 .PHONY: grub